Call gdk_window_enable_synchronized_configure()

Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkplug.c (gtk_plug_realize): Call
	gdk_window_enable_synchronized_configure()

	* gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Make
	noop if gdk_window_enable_synchronized_configure() has not been
	called.

diff --git a/ChangeLog b/ChangeLog
index b100642c7913241ef305d0b2ee9b0659c1475c21..66fa6abd34026016f4a71fa60c301a5af0e91687 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkplug.c (gtk_plug_realize): Call
+       gdk_window_enable_synchronized_configure()
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Make
+       noop if gdk_window_enable_synchronized_configure() has not been
+       called.
+
 2004-08-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooser.[hc]: Add setter and getter for the 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b100642c7913241ef305d0b2ee9b0659c1475c21..66fa6abd34026016f4a71fa60c301a5af0e91687 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkplug.c (gtk_plug_realize): Call
+       gdk_window_enable_synchronized_configure()
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Make
+       noop if gdk_window_enable_synchronized_configure() has not been
+       called.
+
 2004-08-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooser.[hc]: Add setter and getter for the 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b100642c7913241ef305d0b2ee9b0659c1475c21..66fa6abd34026016f4a71fa60c301a5af0e91687 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkplug.c (gtk_plug_realize): Call
+       gdk_window_enable_synchronized_configure()
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Make
+       noop if gdk_window_enable_synchronized_configure() has not been
+       called.
+
 2004-08-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooser.[hc]: Add setter and getter for the 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b100642c7913241ef305d0b2ee9b0659c1475c21..66fa6abd34026016f4a71fa60c301a5af0e91687 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkplug.c (gtk_plug_realize): Call
+       gdk_window_enable_synchronized_configure()
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_configure_finished): Make
+       noop if gdk_window_enable_synchronized_configure() has not been
+       called.
+
 2004-08-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooser.[hc]: Add setter and getter for the 

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 6ecb9371b2a51dc76b47062d274728c40d7f012b..413218187b671988815d508a1b2aed32864eacb0 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -5724,17 +5724,22 @@ gdk_window_enable_synchronized_configure (GdkWindow *window)
 void
 gdk_window_configure_finished (GdkWindow *window)
 {
+  GdkWindowImplX11 *impl;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
   
+  impl = GDK_WINDOW_IMPL_X11 (((GdkWindowObject *)window)->impl);
+  if (!impl->use_synchronized_configure)
+    return;
+  
 #ifdef HAVE_XSYNC
   if (!GDK_WINDOW_DESTROYED (window))
     {
       GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
       GdkToplevelX11 *toplevel = _gdk_x11_window_get_toplevel (window);
 
-      g_return_if_fail (toplevel->update_counter != None);
-      
-      if (toplevel && GDK_DISPLAY_X11 (display)->use_sync &&
+      if (toplevel && toplevel->update_counter != None &&
+         GDK_DISPLAY_X11 (display)->use_sync &&
          !XSyncValueIsZero (toplevel->current_counter_value))
        {
          XSyncSetCounter (GDK_WINDOW_XDISPLAY (window), 

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index f9c2f2bc14d90c643c67b7b2d2a9cc40b436e4b9..b165ed6e091fc8ba71a08472c0f5d54f02434b0b 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -561,6 +561,8 @@ gtk_plug_realize (GtkWidget *widget)
 
   widget->style = gtk_style_attach (widget->style, widget->window);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+
+  gdk_window_enable_synchronized_configure (widget->window);
 }
 
 static void